bitkeeper revision 1.1159.187.62 (41bb06dfBOXZ2Y0I-fSinx_R6pcANQ)

Fix PCI cardbus.

diff --git a/xen/common/physdev.c b/xen/common/physdev.c
index 728a8fe07fad28b66c3bbfacb8a39fccd5c77014..a2559e52230f7fcb58765d1ca4dfeb0191b48c53 100644 (file)
--- a/xen/common/physdev.c
+++ b/xen/common/physdev.c
@@ -742,7 +742,8 @@ void physdev_init_dom0(struct domain *p)
          *
          * In Linux2.6 we set pcibios_scan_all_fns().
          */
-        if ( dev->hdr_type != PCI_HEADER_TYPE_NORMAL )
+        if ( (dev->hdr_type != PCI_HEADER_TYPE_NORMAL) &&
+             (dev->hdr_type != PCI_HEADER_TYPE_CARDBUS) )
             continue;
         pdev = xmalloc(sizeof(phys_dev_t));
         pdev->dev = dev;